Don't bother compiling gtksearchenginebeagle.c and

2008-04-02  Tor Lillqvist  <tml@novell.com>

	* gtk/Makefile.am: Don't bother compiling gtksearchenginebeagle.c
	and gtksearchenginetracker.c on Windows.

	* gtk/gtksearchengine.c: Don't define HAVE_BEAGLE and HAVE_TRACKER
	on Windows.

svn path=/trunk/; revision=19959

diff --git a/ChangeLog b/ChangeLog
index b5b1466a9940fcb9e46d573ae4db2a6634b1ba39..ef994d56b383e0053548173fcff385a19d52df45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-02  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/Makefile.am: Don't bother compiling gtksearchenginebeagle.c
+       and gtksearchenginetracker.c on Windows.
+
+       * gtk/gtksearchengine.c: Don't define HAVE_BEAGLE and HAVE_TRACKER
+       on Windows.
+
 2008-04-01  Cody Russell  <bratsche@gnome.org>
 
        * configure.in: Bump required Cairo to 1.5.2.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c20b2b0b1516e2bbca8fc6ad1f3744f67d8a3406..539a54c0fb2af11dc277ec0c5bdf0c4f48086c5e 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -347,8 +347,6 @@ gtk_semi_private_h_sources =    \
 gtk_private_h_sources =                \
        gtkquery.h              \
        gtksearchengine.h       \
-       gtksearchenginebeagle.h \
-       gtksearchenginetracker.h\
        gtksearchenginesimple.h \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
@@ -394,8 +392,6 @@ gtk_private_h_sources =             \
 gtk_base_c_sources =            \
        gtkquery.c              \
        gtksearchengine.c       \
-       gtksearchenginebeagle.c \
-       gtksearchenginetracker.c\
        gtksearchenginesimple.c \
        fnmatch.c               \
        gtkaboutdialog.c        \
@@ -662,7 +658,9 @@ gtk_os_unix_c_sources = \
        gtkprintjob.c                   \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
-        gtkprintbackend.c
+        gtkprintbackend.c              \
+       gtksearchenginebeagle.c         \
+       gtksearchenginetracker.c
 gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
 gtk_private_h_sources += \
@@ -672,7 +670,9 @@ gtk_private_h_sources += \
        gtkprinter-private.h            \
        gtkprinteroption.h              \
        gtkprinteroptionset.h           \
-       gtkprinteroptionwidget.h
+       gtkprinteroptionwidget.h        \
+       gtksearchenginebeagle.h         \
+       gtksearchenginetracker.h
 gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 

diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c
index c1d23a4f55dd94ac0f5a9b22970960c6fcbd5628..790e4117ae0ca20d835fdb138f7d57ae4ecee147 100644 (file)
--- a/gtk/gtksearchengine.c
+++ b/gtk/gtksearchengine.c
@@ -29,9 +29,15 @@
 
 #include <gdk/gdkconfig.h> /* for GDK_WINDOWING_QUARTZ */
 
+#ifndef G_OS_WIN32             /* Beagle and tracker are not ported
+                                * to Windows, as far as I know.
+                                */
+
 #define HAVE_BEAGLE  1 
 #define HAVE_TRACKER 1
 
+#endif
+
 enum 
 {
   HITS_ADDED,